test commit; moshimo 
casio
modify 1

dev modify
abc

dev modify 2

master modify 2

dev modify3

dev modify4

dev modify5,merge with --no-ff

dev modify6,merge with --no-ff,has conflict

dev modify7

dev modify8

dev modify9

create conflict is terrible
.......................
......>>>